Don't use image->attach_points where image->n_attach_points was meant.

2007-09-07  Matthias Clasen  <mclasen@redhat.com>

        * gtk/updateiconcache.c (get_image_meta_data_size): Don't
        use image->attach_points where image->n_attach_points was meant.
        Pointed out by Albert Chin.

svn path=/trunk/; revision=18756

diff --git a/ChangeLog b/ChangeLog
index 38ae4d4baade62b2458594a1d2835d1b91b5b4f9..a7f236d2d82bfa865fcf863194220103db1dc66d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/updateiconcache.c (get_image_meta_data_size): Don't
+       use image->attach_points where image->n_attach_points was meant.
+       Pointed out by Albert Chin.
+
 2007-09-07  Wouter Bolsterlee  <wbolster@svn.gnome.org>
 
        * modules/printbackends/cups/gtkcupsutils.c:

diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index d11f11f909865dbb4413041119d1fdb2a1a05c85..d44d93e5e0b37ba51dcf18be47987a78961609af 100644 (file)
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -971,7 +971,7 @@ get_image_meta_data_size (Image *image)
           data->size = 0;
 
           if (data->has_embedded_rect ||
-              data->attach_points > 0 ||
+              data->n_attach_points > 0 ||
               data->n_display_names > 0)
             data->size += 12;
 
@@ -997,11 +997,8 @@ get_image_meta_data_size (Image *image)
                        * pool in case the same string occurs twice
                        * during a get_single_node_size() calculation.
                        */
-                      //g_print ("adding non-written out string %s\n", data->display_names[i]);
                       add_string (data->display_names[i], -1);
                     }
-                  //else
-                    //g_print ("found string %s in pool: %d\n", data->display_names[i], poolv);
                 }
            }